Merge "Make morenotlisted more grammar-friendly"